Install gmapbase.html.

Also patch a useful path into gpsbabelfe.

LP: #1015886

diff --git a/debian/gpsbabel-gui.install b/debian/gpsbabel-gui.install
index c093b335ae092ae71eecf2db0a632693405f1bbb..30392ad1b1dc2981b1785741cfd106a1f7b0853d 100644 (file)
--- a/debian/gpsbabel-gui.install
+++ b/debian/gpsbabel-gui.install
@@ -1,3 +1,4 @@
 gui/objects/gpsbabelfe /usr/bin
 debian/gpsbabel.xpm /usr/share/pixmaps
 gui/gpsbabel.desktop /usr/share/applications
+gui/gmapbase.html /usr/share/gpsbabel

diff --git a/debian/patches/gmapbase.html-location b/debian/patches/gmapbase.html-location
new file mode 100644 (file)
index 0000000..bbfe44c
--- /dev/null
+++ b/debian/patches/gmapbase.html-location
@@ -0,0 +1,11 @@
+--- a/gui/map.cc
++++ b/gui/map.cc
+@@ -90,7 +90,7 @@ Map::Map(QWidget* parent,
+   connect(mclicker, SIGNAL(logTime(QString)), this, SLOT(logTime(QString)));
+ #endif
+ 
+-  QString baseFile =  QApplication::applicationDirPath() + "/gmapbase.html";
++  QString baseFile =  "/usr/share/gpsbabel/gmapbase.html";
+   if (!QFile(baseFile).exists()) {
+     QMessageBox::critical(nullptr, appName,
+                           tr("Missing \"gmapbase.html\" file.  Check installation"));

diff --git a/debian/patches/series b/debian/patches/series
index 64be841375da292e5bcb5b958e9598992d8056d5..f9753b992631f04355c4806f555ef37d48ee037b 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@ htmldoc-location
 0010-Fix-manpage-xml.patch
 cross.patch
 0012-The-lezyne-super-gps-every-10th-ride-or-so-outputs-a.patch
+gmapbase.html-location